From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 13 Jul 2011 03:42:26 +0000 (-0700)
Subject: * image.c (png_load): Don't assume height * row_bytes fits in 'int'.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2464^2~93
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=007caa2071e018bb5a1dc811d626d6279b58095e;p=emacs.git

* image.c (png_load): Don't assume height * row_bytes fits in 'int'.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index afaaa374340..facb10cef4a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* image.c (png_load): Don't assume height * row_bytes fits in 'int'.
+
 2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* bidi.c (bidi_dump_cached_states): Use pD to print ptrdiff_t.
diff --git a/src/image.c b/src/image.c
index f6626f61c83..1b6e67b4404 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5558,7 +5558,8 @@ png_load (struct frame *f, struct image *img)
 {
   Lisp_Object file, specified_file;
   Lisp_Object specified_data;
-  int x, y, i;
+  int x, y;
+  ptrdiff_t i;
   XImagePtr ximg, mask_img = NULL;
   png_struct *png_ptr = NULL;
   png_info *info_ptr = NULL, *end_info = NULL;